bitkeeper revision 1.1211 (42135fc9O6u50eCen5G3SeEPjYjX6w)

Fix interrupt enable during ia64 bootstrap to avoid race.
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/ia64/xensetup.c b/xen/arch/ia64/xensetup.c
index 131276e42c10b7af64956844fc1082680f2c04f1..e778b897d9da3c5b20972a7050079db3492f51be 100644 (file)
--- a/xen/arch/ia64/xensetup.c
+++ b/xen/arch/ia64/xensetup.c
@@ -20,6 +20,7 @@
 //#include <xen/console.h>
 //#include <xen/serial.h>
 #include <xen/trace.h>
+#include <linux/interrupt.h>
 //#include <asm/shadow.h>
 //#include <asm/io.h>
 //#include <asm/uaccess.h>
@@ -291,6 +292,7 @@ void cmain(multiboot_info_t *mbi)
                        SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
 printk("About to call scheduler_init()\n");
     scheduler_init();
+    cli();
 printk("About to call time_init()\n");
     time_init();
 printk("About to call ac_timer_init()\n");
@@ -410,6 +412,7 @@ printk("About to call init_trace_bufs()\n");
 #endif
     domain_unpause_by_systemcontroller(dom0);
     domain0_ready = 1;
+    sti();
 printk("About to call startup_cpu_idle_loop()\n");
     startup_cpu_idle_loop();
 }